Fix 64-bit build.

diff --git a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c
index c891371b28d4a1a2726575675134c1ed0809328f..32091d2496b5580a107e481de3f76a9986bd555a 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/e820.c
@@ -20,6 +20,9 @@
 #include <asm/e820.h>
 #include <asm/proto.h>
 #include <asm/bootsetup.h>
+#include <asm-xen/xen-public/memory.h>
+
+unsigned long pci_mem_start = 0xaeedbabe;
 
 /* 
  * PFN of last memory page.
@@ -605,8 +608,6 @@ void __init parse_memopt(char *p, char **from)
         xen_override_max_pfn = (unsigned long) end_user_pfn;
 } 
 
-unsigned long pci_mem_start = 0xaeedbabe;
-
 /*
  * Search for the biggest gap in the low 32 bits of the e820
  * memory space.  We pass this space to PCI to assign MMIO resources

diff --git a/tools/xenstore/xenstored_core.c b/tools/xenstore/xenstored_core.c
index 3c7e6cc12de935eab7a4bd7a04fdab6eb758d5ea..10c9f5db337a99fd73470b920c4a1ce357508286 100644 (file)
--- a/tools/xenstore/xenstored_core.c
+++ b/tools/xenstore/xenstored_core.c
@@ -719,7 +719,7 @@ static char *get_parent(const char *node)
        char *slash = strrchr(node + 1, '/');
        if (!slash)
                return talloc_strdup(node, "/");
-       return talloc_asprintf(node, "%.*s", slash - node, node);
+       return talloc_asprintf(node, "%.*s", (int)(slash - node), node);
 }
 
 static enum xs_perm_type perm_for_id(domid_t id,
@@ -910,7 +910,7 @@ static bool commit_dir(char *dir)
        if (slash)
                *slash = '\0';
 
-       dest = talloc_asprintf(dir, "%.*s", dot - dir, dir);
+       dest = talloc_asprintf(dir, "%.*s", (int)(dot - dir), dir);
        return rename(dir, dest) == 0;
 }